debian/xen-utils-common.*: remove xend cruft

xend is obsolete and removed. Still, there are some traces of it in init
and other scripts. Remove all of it now.

Also remove a migration step about upgrading to 4.1, since we don't
support directly upgrading from something older than that to the current
package.

diff --git a/debian/xen-utils-common.README.Debian b/debian/xen-utils-common.README.Debian
index 873a9d3fc9efb5bd8f7e35463c189755d7e9d235..b312a7f27c7d03a0aafd8f4b90bd5e2c94fc09a6 100644 (file)
--- a/debian/xen-utils-common.README.Debian
+++ b/debian/xen-utils-common.README.Debian
@@ -22,8 +22,3 @@ differs from the upstream version, which overwrites the main network card
 
 To setup a bridge please follow the instructions in the manpage for
 bridge-utils-interfaces(5).
-
-You can also change the /etc/xen/xend-config.sxp file and re-enable the Xen
-included network setup by adding
-  (network-script network-bridge)
-to the file. But please note that this may or may not work.

diff --git a/debian/xen-utils-common.postinst b/debian/xen-utils-common.postinst
index f719731affabf0a5830e3b8b5eb6fef6429163ff..c77dff087aa16c7759968f9d7d829578726ad6a1 100644 (file)
--- a/debian/xen-utils-common.postinst
+++ b/debian/xen-utils-common.postinst
@@ -16,8 +16,6 @@ abort-upgrade|abort-remove|abort-deconfigure)
        ;;
 esac
 
-dpkg-maintscript-helper mv_conffile /etc/init.d/xend /etc/init.d/xen 4.1.2-4~ -- "$@"
-
 #DEBHELPER#
 
 exit 0

diff --git a/debian/xen-utils-common.postrm b/debian/xen-utils-common.postrm
index 48b57ead0c95c2944f1eedefe36ce52a55029de2..c96620cd405336aadee6a796fc15346b9a4397cd 100644 (file)
--- a/debian/xen-utils-common.postrm
+++ b/debian/xen-utils-common.postrm
@@ -16,8 +16,6 @@ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
        ;;
 esac
 
-dpkg-maintscript-helper mv_conffile /etc/init.d/xend /etc/init.d/xen 4.1.2-4~ -- "$@"
-
 #DEBHELPER#
 
 exit 0

diff --git a/debian/xen-utils-common.preinst b/debian/xen-utils-common.preinst
index 5f9c729374e40c7a0ce9deead899b084ee96d0c7..7e9a51b975ad936dd1d94d08c1acd4f6768d7969 100644 (file)
--- a/debian/xen-utils-common.preinst
+++ b/debian/xen-utils-common.preinst
@@ -15,9 +15,6 @@ abort-upgrade)
        ;;
 esac
 
-dpkg-maintscript-helper mv_conffile /etc/init.d/xend /etc/init.d/xen 4.1.2-4~ -- "$@"
-update-rc.d -f xend remove >/dev/null
-
 #DEBHELPER#
 
 exit 0

diff --git a/debian/xen-utils-common.xen.init b/debian/xen-utils-common.xen.init
index 3411c15b0f9c7fa9751dac9f9e5870b3abc20bb5..4b793d5ac2fb7cc7f6d17073027dd667a413cc3c 100644 (file)
--- a/debian/xen-utils-common.xen.init
+++ b/debian/xen-utils-common.xen.init
@@ -1,6 +1,6 @@
 #!/bin/sh
 ### BEGIN INIT INFO
-# Provides:          xen xend
+# Provides:          xen
 # Required-Start:    $syslog $remote_fs
 # Required-Stop:     $syslog $remote_fs
 # Default-Start:     2 3 4 5
@@ -16,7 +16,6 @@
 XENSTORED_DIR="/var/run/xenstored"
 
 [ -r /etc/default/xen ] && . /etc/default/xen
-[ -r /etc/default/xend ] && . /etc/default/xend
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DESC="Xen daemons"
@@ -26,13 +25,7 @@ if [ $? -ne 0 ]; then
        log_warning_msg "Not running within Xen or no compatible utils"
        exit 0
 fi
-TOOLSTACK=$(/usr/lib/xen-common/bin/xen-toolstack 2>/dev/null)
-if [ $? -ne 0 ]; then
-       log_warning_msg "No usable Xen toolstack selected"
-       exit 0
-fi
 
-[ -e "$ROOT"/bin/xend ] && XEND="$ROOT"/bin/xend
 XENCONSOLED="$ROOT"/bin/xenconsoled
 XENCONSOLED_PIDFILE="/var/run/xenconsoled.pid"
 XENSTORED="$ROOT"/bin/xenstored
@@ -72,70 +65,6 @@ env_setup()
        [ -x /sbin/restorecon ] && /sbin/restorecon /run/xen
 }
 
-xend_start()
-{
-       if [ -z "$XEND" ] || [ "$(basename "$TOOLSTACK")" != xm ]; then
-               return 0
-       fi
-
-       log_progress_msg "xend"
-       xend_start_real
-       return $?
-}
-
-xend_stop()
-{
-       if [ -z "$XEND" ] || [ "$(basename "$TOOLSTACK")" != xm ]; then
-               return 0
-       fi
-
-       log_progress_msg "xend"
-       xend_stop_real
-       return $?
-}
-
-xend_restart()
-{
-       if [ -z "$XEND" ] || [ "$(basename "$TOOLSTACK")" != xm ]; then
-               return 0
-       fi
-
-       log_progress_msg "xend"
-       xend_stop_real
-       case "$?" in
-               0|1)
-               xend_start_real
-               case "$?" in
-                       0) ;;
-                       *) return 2 ;;
-               esac
-               ;;
-               *) return 2 ;;
-       esac
-       return 0
-}
-
-xend_start_real()
-{
-       $XEND status && return 1
-       $XEND start || return 2
-
-       i=0
-       while [ $i -lt 10 ]; do
-               $XEND status && return 0 || true
-               i=$(($i + 1))
-               sleep 1
-       done
-       return 2
-}
-
-xend_stop_real()
-{
-       log_progress_msg "xend"
-       $XEND status || return 0
-       $XEND stop || return 1
-}
-
 xenconsoled_start()
 {
        log_progress_msg "xenconsoled"
@@ -302,11 +231,6 @@ case "$1" in
                0|1) ;;
                *) log_end_msg 1; exit ;;
        esac
-       xend_start
-       case "$?" in
-               0|1) ;;
-               *) log_end_msg 1; exit ;;
-       esac
        init_dom0
        case "$?" in
                0|1) ;;
@@ -332,11 +256,6 @@ case "$1" in
                0|1) ;;
                *) ret=1 ;;
        esac
-       xend_stop
-       case "$?" in
-               0|1) ;;
-               *) ret=1 ;;
-       esac
        xenconsoled_stop
        case "$?" in
                0|1) ;;
@@ -357,11 +276,6 @@ case "$1" in
                0|1) ;;
                *) ret=1 ;;
        esac
-       xend_restart
-       case "$?" in
-               0|1) ;;
-               *) ret=1 ;;
-       esac
        xenconsoled_restart
        case "$?" in
                0|1) ;;

diff --git a/debian/xen-utils-common.xend.default b/debian/xen-utils-common.xend.default
deleted file mode 100644 (file)
index 589da35..0000000
--- a/debian/xen-utils-common.xend.default
+++ /dev/null
@@ -1,2 +0,0 @@
-XENCONSOLED_ARGS=
-XENSTORED_ARGS=

diff --git a/debian/xen-utils-common.xendomains.init b/debian/xen-utils-common.xendomains.init
index e1164b21bb7b919c1a7c6a0cfd3ef119042f79c0..36d23f722beb86a700366bf90ec8e2cde9aeb927 100644 (file)
--- a/debian/xen-utils-common.xendomains.init
+++ b/debian/xen-utils-common.xendomains.init
@@ -23,15 +23,6 @@ then
        exit 0;
 fi
 
-TOOLSTACK=$(/usr/lib/xen-common/bin/xen-toolstack 2>/dev/null)
-if [ $? -ne 0 ]; then
-        log_warning_msg "No usable Xen toolstack selected"
-        exit 0
-fi
-if [ "$(basename "$TOOLSTACK")" != xm ] && [ "$(basename "$TOOLSTACK")" != xl ]; then
-       exit 0
-fi
-
 if ! [ -e /proc/xen/privcmd ]; then
        exit 0
 fi